Replace public_key_registry from cis3_sponsored_transaction with corresponding smart contract features
#318
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
abizjak
force-pushed
the
acc-sig-checksd
branch
2 times, most recently
from
d9d1177
to
6954787
Compare
abizjak
force-pushed
the
258-use-public-keys
branch
from
37c6f47
to
965754a
Compare
abizjak
reviewed
Jul 15, 2023
DOBEN
force-pushed
the
258-use-public-keys
branch
from
40a4de0
to
7fd0076
Compare
DOBEN
force-pushed
the
258-use-public-keys
branch
2 times, most recently
from
47d95ba
to
5f39029
Compare
abizjak
reviewed
Aug 7, 2023
| @@ -22,8 +22,8 @@ quickcheck = {version = "1", optional = true } | |||
| getrandom = { version = "0.2", features = ["custom"], optional = true } | |||
|
|
|||
| [dependencies.concordium-contracts-common] | |||
| path = "../concordium-contracts-common/concordium-contracts-common" | |||
| version = "7.0" | |||
| path = "../../../LocalTestingLibrary/concordium-smart-contract-tools/concordium-base/concordium-contracts-common/concordium-contracts-common" | |||
There was a problem hiding this comment.
I am still not sure what the best option for this is. Once we release the libraries we can use the published ones for this PR, but we should also try to think about a long-term solution.
Comment on lines
+60
to
+85
| let mut inner_key_map: BTreeMap<KeyIndex, VerifyKey> = BTreeMap::new(); | ||
|
|
||
| inner_key_map.insert( | ||
| KeyIndex(0u8), | ||
| VerifyKey::Ed25519VerifyKey( | ||
| ed25519_dalek::PublicKey::from_bytes(&PUBLIC_KEY) | ||
| .expect("Should be able to create public key"), | ||
| ), | ||
| ); | ||
|
|
||
| let credential_public_keys = CredentialPublicKeys { | ||
| keys: inner_key_map, | ||
| threshold: SignatureThreshold::ONE, | ||
| }; | ||
|
|
||
| let mut key_map: BTreeMap<CredentialIndex, CredentialPublicKeys> = BTreeMap::new(); | ||
| key_map.insert( | ||
| CredentialIndex { | ||
| index: 0u8, | ||
| }, | ||
| credential_public_keys, | ||
| ); | ||
|
|
||
| let keys = AccountAccessStructure { | ||
| keys: key_map, | ||
| threshold: AccountThreshold::ONE, | ||
| }; |
There was a problem hiding this comment.
Suggested change
| let mut inner_key_map: BTreeMap<KeyIndex, VerifyKey> = BTreeMap::new(); | |
| inner_key_map.insert( | |
| KeyIndex(0u8), | |
| VerifyKey::Ed25519VerifyKey( | |
| ed25519_dalek::PublicKey::from_bytes(&PUBLIC_KEY) | |
| .expect("Should be able to create public key"), | |
| ), | |
| ); | |
| let credential_public_keys = CredentialPublicKeys { | |
| keys: inner_key_map, | |
| threshold: SignatureThreshold::ONE, | |
| }; | |
| let mut key_map: BTreeMap<CredentialIndex, CredentialPublicKeys> = BTreeMap::new(); | |
| key_map.insert( | |
| CredentialIndex { | |
| index: 0u8, | |
| }, | |
| credential_public_keys, | |
| ); | |
| let keys = AccountAccessStructure { | |
| keys: key_map, | |
| threshold: AccountThreshold::ONE, | |
| }; | |
| let rng = &mut rand::thread_rng(); | |
| let keypairs = AccountKeys::singleton(rng); | |
| let keys: AccountAccessStructure = (&keypairs).into(); |
Comment on lines
+143
to
+148
| let mut inner_signature_map = BTreeMap::new(); | ||
| inner_signature_map.insert(0u8, concordium_std::Signature::Ed25519(SIGNATURE_UPDATE_OPERATOR)); | ||
|
|
||
| let mut signature_map = BTreeMap::new(); | ||
| signature_map.insert(0u8, CredentialSignatures { | ||
| sigs: inner_signature_map, | ||
| }); |
There was a problem hiding this comment.
If we unify AccountSignature and TransactionSignature this will become
let signature = keypairs.sign(&to_bytes(...))
Comment on lines
+267
to
+264
| let mut inner_key_map: BTreeMap<u8, PublicKey> = BTreeMap::new(); | ||
|
|
||
| inner_key_map.insert(0u8, PublicKey::Ed25519(concordium_std::PublicKeyEd25519(PUBLIC_KEY))); | ||
|
|
||
| let credential_public_keys = concordium_std::CredentialPublicKeys { | ||
| keys: inner_key_map, | ||
| threshold: SignatureThreshold::ONE, | ||
| }; | ||
|
|
||
| let mut key_map: BTreeMap<u8, concordium_std::CredentialPublicKeys> = BTreeMap::new(); | ||
| key_map.insert(0u8, credential_public_keys); | ||
|
|
||
| let account_public_keys: AccountPublicKeys = AccountPublicKeys { | ||
| keys: key_map, | ||
| threshold: AccountThreshold::ONE, | ||
| }; |
There was a problem hiding this comment.
Suggested change
| let mut inner_key_map: BTreeMap<u8, PublicKey> = BTreeMap::new(); | |
| inner_key_map.insert(0u8, PublicKey::Ed25519(concordium_std::PublicKeyEd25519(PUBLIC_KEY))); | |
| let credential_public_keys = concordium_std::CredentialPublicKeys { | |
| keys: inner_key_map, | |
| threshold: SignatureThreshold::ONE, | |
| }; | |
| let mut key_map: BTreeMap<u8, concordium_std::CredentialPublicKeys> = BTreeMap::new(); | |
| key_map.insert(0u8, credential_public_keys); | |
| let account_public_keys: AccountPublicKeys = AccountPublicKeys { | |
| keys: key_map, | |
| threshold: AccountThreshold::ONE, | |
| }; | |
| let account_public_keys = (&keypairs).into(); |
limemloh
approved these changes
Aug 9, 2023
Merged
DOBEN
force-pushed
the
258-use-public-keys
branch
from
5f39029
to
cd9883e
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
addresses #258
After the new protocol update P6, smart contracts can now get the
public_keysof accounts within the smart contract code. There is also a newcheck_account_signaturefunction available.The
public_key_registryis not necessary anymore in the sponsored transaction smart contract and should be replaced.Note: This PR is a draft and has some local dependencies hardcoded to simplify the use of a "local/unreleased" smart contract testing integration library. This needs to be updated/changed before merging.
https://github.com/Concordium/concordium-smart-contract-tools/tree/main/concordium-smart-contract-testing
Changes
public_key_registry.check_account_signatureto verify the signature in the smart contract.publicKeyOffunction (returned a tuple pair (public key, nonce)) with two separate functionspublicKeyOf(returns public keys for a vector of accounts) andnonceOf(returns nonces for a vector of accounts).Signature/PublicKeytypes were removed fromconcordium_stdand are now available viaconcordium_contracts_common.